XI2: translate group state back into core state

This is necessary to make the key event translation work
as expected.

https://bugzilla.gnome.org/show_bug.cgi?id=641367

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index a3700de7578de4a2fe39cb2fac28a107839cd97b..4b718102ba68a5bd5c3a56cbcd82902f42a9d373 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -728,5 +728,17 @@ _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
         }
     }
 
+  if (group_state)
+    {
+      gint group;
+
+      group = group_state->base + group_state->latched + group_state->locked;
+
+      /* FIXME: do we need the XKB complications for this ? */
+      group = CLAMP(group, 0, 3);
+
+      state |= group << 13;
+    }
+
   return state;
 }